Check for nl_langinfo() Use nl_langinfo() when it's available to determine

2005-01-13  Matthias Clasen  <mclasen@redhat.com>

	* configure.in: Check for nl_langinfo()
	* gtk/gtkcalendar.c: (gtk_calendar_init): Use nl_langinfo() when it's
	available to determine first day of week   (#163842, Vincent Untz)

diff --git a/ChangeLog b/ChangeLog
index 7672951b560e2741a636e7c1fc3a0260cf1543a0..fc7d681298ee7eedfef86226bc8bda0eb29ef20c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2005-01-13  Matthias Clasen  <mclasen@redhat.com>
 
+       * configure.in: Check for nl_langinfo()
+       * gtk/gtkcalendar.c: (gtk_calendar_init): Use nl_langinfo() when it's
+       available to determine first day of week   (#163842, Vincent Untz)
+
        * gtk/gtkuimanager.c (gtk_ui_manager_get_widget): Add hints about 
        the lifecycle of widgets.  (#159503, Christian Persch)
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 7672951b560e2741a636e7c1fc3a0260cf1543a0..fc7d681298ee7eedfef86226bc8bda0eb29ef20c 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,9 @@
 2005-01-13  Matthias Clasen  <mclasen@redhat.com>
 
+       * configure.in: Check for nl_langinfo()
+       * gtk/gtkcalendar.c: (gtk_calendar_init): Use nl_langinfo() when it's
+       available to determine first day of week   (#163842, Vincent Untz)
+
        * gtk/gtkuimanager.c (gtk_ui_manager_get_widget): Add hints about 
        the lifecycle of widgets.  (#159503, Christian Persch)
 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 7672951b560e2741a636e7c1fc3a0260cf1543a0..fc7d681298ee7eedfef86226bc8bda0eb29ef20c 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,9 @@
 2005-01-13  Matthias Clasen  <mclasen@redhat.com>
 
+       * configure.in: Check for nl_langinfo()
+       * gtk/gtkcalendar.c: (gtk_calendar_init): Use nl_langinfo() when it's
+       available to determine first day of week   (#163842, Vincent Untz)
+
        * gtk/gtkuimanager.c (gtk_ui_manager_get_widget): Add hints about 
        the lifecycle of widgets.  (#159503, Christian Persch)
 

diff --git a/configure.in b/configure.in
index 6de77975b1bf5e11de67cebaa86e7207747196c4..b6f047e6a758f0d981d813ee424c62075ed31869 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -396,7 +396,7 @@ if test "x$enable_rebuilds" = "xyes" && \
 fi
 AC_SUBST(REBUILD)
 
-AC_CHECK_FUNCS(lstat mkstemp flockfile)
+AC_CHECK_FUNCS(lstat mkstemp flockfile nl_langinfo)
 
 # sigsetjmp is a macro on some platforms, so AC_CHECK_FUNCS is not reliable
 AC_MSG_CHECKING(for sigsetjmp)

diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c
index d048025ae2bfb006536718db8f1446726d4a7cf0..0f45c040414838b2f5e4fa09a8dae8bd5c16e6fc 100644 (file)
--- a/gtk/gtkcalendar.c
+++ b/gtk/gtkcalendar.c
@@ -34,6 +34,9 @@
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
+#ifdef HAVE_NL_LANGINFO
+#include <langinfo.h>
+#endif
 #include <string.h>
 #include <stdlib.h>
 #include <time.h>
@@ -703,6 +706,10 @@ gtk_calendar_init (GtkCalendar *calendar)
   else if (strcmp (year_before, "calendar:MY") != 0)
     g_warning ("Whoever translated calendar:MY did so wrongly.\n");
 
+#if defined (HAVE_NL_LANGINFO) && defined (_NL_TIME_FIRST_WEEKDAY)
+  week_start = nl_langinfo (_NL_TIME_FIRST_WEEKDAY);
+  private_data->week_start = *((unsigned char *) week_start) % 7;
+#else
   /* Translate to calendar:week_start:0 if you want Sunday to be the
    * first day of the week to calendar:week_start:1 if you want Monday
    * to be the first day of the week, and so on.
@@ -719,6 +726,7 @@ gtk_calendar_init (GtkCalendar *calendar)
       g_warning ("Whoever translated calendar:week_start:0 did so wrongly.\n");
       private_data->week_start = 0;
     }
+#endif
 }
 
 GtkWidget*